chain to the extra_widget.

Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
        chain to the extra_widget.

diff --git a/ChangeLog b/ChangeLog
index 9776afbe68f9a674037c89f090add91cf3fa8835..87a59b97111d1c2bc518a7a62819325a4dda9310 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
+       chain to the extra_widget.
+
 Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9776afbe68f9a674037c89f090add91cf3fa8835..87a59b97111d1c2bc518a7a62819325a4dda9310 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
+       chain to the extra_widget.
+
 Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9776afbe68f9a674037c89f090add91cf3fa8835..87a59b97111d1c2bc518a7a62819325a4dda9310 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
+       chain to the extra_widget.
+
 Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9776afbe68f9a674037c89f090add91cf3fa8835..87a59b97111d1c2bc518a7a62819325a4dda9310 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
+       chain to the extra_widget.
+
 Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9776afbe68f9a674037c89f090add91cf3fa8835..87a59b97111d1c2bc518a7a62819325a4dda9310 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Mar  5 03:37:14 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all):
+       chain to the extra_widget.
+
 Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index bbb3a36a60969819f2d7e87501a28b6f79bc5172..801a2ec113b8b64ed3b0c73c107cc952a882d64d 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -707,7 +707,7 @@ set_preview_widget (GtkFileChooserDefault *impl,
   impl->preview_widget = preview_widget;
   if (impl->preview_widget)
     {
-      gtk_widget_show_all (impl->preview_widget);
+      gtk_widget_show (impl->preview_widget);
       gtk_box_pack_start (GTK_BOX (impl->preview_box), impl->preview_widget, TRUE, TRUE, 0);
       gtk_box_reorder_child (GTK_BOX (impl->preview_box),
                             impl->preview_widget,
@@ -2615,7 +2615,12 @@ gtk_file_chooser_default_dispose (GObject *object)
 static void
 gtk_file_chooser_default_show_all (GtkWidget *widget)
 {
+  GtkFileChooserDefault *impl = (GtkFileChooserDefault *) object;
+
   gtk_widget_show (widget);
+
+  if (impl->extra_widget)
+    gtk_widget_show_all (impl->extra_widget);
 }
 
 static void